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

Change-Id: I690f14ee505c0d66a6c5f08c8c242755801d9f50