[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "revert-25262177-anon_bt_address_sc_v2_dev-CYUVCHDQFR" into sc-v2-dev am: 8dd9150b -s ours am: d2c6aba0 -s ours am: bd928fbb -s ours am: a1616ef6 -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/+/26597514



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