Merge "Add logs with scanner id information" into main am: 609fc578 am: bdfdb5a7

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



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