[automerger skipped] Merge changes from topic "revert-25286114-anon_bt_address_sc_dev-EJTAFKHERK" into sc-dev am: 89eaf19e -s ours am: 7ce2f230 -s ours

am skip reason: Merged-In I97a97fea0952227a9663e7001c9f031fb3cc725e with SHA-1 24af9bf0 is already in history

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



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