Merge "Update os_pickup.bp and disable sm7150 gps am: 94396cbb48 am: 49f061a7be" into rvc-d1-dev-plus-aosp am: 73bf3b8e74

Change-Id: I2328d90167f582ab5857d4cc011d9473b0a3c393