[automerger skipped] Merge "Force OOB Advertising to use a random address"...

[automerger skipped] Merge "Force OOB Advertising to use a random address" into tm-qpr-dev am: 3205be95 -s ours am: 1931329f -s ours

am skip reason: Merged-In Ie4f31a8357ad2ae5f1bddcc033b834ba488f1ab3 with SHA-1 9f13bcd5 is already in history

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



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