[automerger skipped] Merge "BT: public address adv worng." into tm-qpr-dev am:...

[automerger skipped] Merge "BT: public address adv worng." into tm-qpr-dev am: 135f4999 -s ours am: 87c12c40 -s ours

am skip reason: Merged-In Ib032bcc9500ed2dc1856b52d90d229bc2d9d1e54 with SHA-1 d127d9b5 is already in history

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



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