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