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

Change-Id: Iafc4702a4df72f1b8df4571f61ae9cf02d01e7e5