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

Change-Id: Id80c7be63e5f615c754c54584290b346bc35b6a4