[automerger skipped] Merge changes from topic "anon_bt_address_sc_v2_dev" into...

[automerger skipped] Merge changes from topic "anon_bt_address_sc_v2_dev" into sc-v2-dev am: 84152b15 -s ours am: b770486c -s ours am: 140a578c -s ours am: 6169bb47 -s ours am: 20621a73 -s ours

am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 4c1d23ed is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25262178



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