Merge "Add dump of ScanController.java#mScannerMap when...

Merge "Add dump of ScanController.java#mScannerMap when `scan_manager_refactor` is on" into main am: bc85480d am: 1f4a2436

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3490675



Change-Id: I8e7b2cc0f735a3f52cc6ddbb95bfbc0342d7d083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>