[automerger skipped] Add support for address hiding [1/3] am: 0c9bd3d8 am: 97d45182 -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: I55f3298ee51d744bb7fdbdb6b5cf6541a6a70a2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>