Update os_pickup.bp and disable sm7150 gps am: 94396cbb48 am: ec7c853b7e

Change-Id: Icdb81e41629cf6afb8aa32d79a2653c7e9fde7a4