[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 am: 2b70ffd3 -s ours

am skip reason: Merged-In Ie4f31a8357ad2ae5f1bddcc033b834ba488f1ab3 with SHA-1 174abcf0 is already in history

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



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