[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "revert-25262180-anon_bt_address_tm_qpr_dev-DZEKTEKBCN" into tm-qpr-dev am: bdd4495e -s ours am: 98cc9a1e -s ours am: 2d96236c -s ours

am skip reason: Merged-In Idabcc84cb0f5f6f88ba5aebc435511ab95016ef3 with SHA-1 68a3c413 is already in history. Merged-In was found from reverted change.

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



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