[automerger skipped] Add support for address hiding [1/3] am: 0c9bd3d8 -s...

[automerger skipped] Add support for address hiding [1/3] am: 0c9bd3d8 -s ours am: 355eab6e -s ours

am skip reason: Merged-In I455abdd9c52f0e76ab1a352ccdfbae76edf5add6 with SHA-1 d5c33f43 is already in history

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



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