[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "revert-25285859-anon_bt_address_sc_qpr1_dev-BPSMRIRDYG" into sc-qpr1-dev am: 544f1fb3 -s ours am: e2c0ae01 -s ours am: 27ef5d58 -s ours

am skip reason: Merged-In I1b751ee48f47e6394d07c9f15de411857428c9f1 with SHA-1 0dd3ca5e is already in history

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



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