Merge "Fix location for BLE and classic scan results" am: 5d5b33d9ac
am: 7b30119e2c

Change-Id: I0579e72158cc121f315b4cd5f4e6aa48f319fad7