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

Change-Id: I83eb308aa45b5af683a32be384002f012d3b1324