Fix location for BLE and classic scan results

Test: manual
Bug: 118347564
Bug: 118347252
Change-Id: I0cb22de5f7214db874b75eba91d5ff6076d959b5
6 files changed