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

[automerger skipped] Merge changes from topic "anon_bt_address_sc_dev" into sc-dev am: 84090150 -s ours am: 680709cf -s ours am: 39a185c6 -s ours

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

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



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