tree 405b15c799f30f36a2b6f4d5aaba1b1138ed709b
parent e61421add2221187e7b43d6879bb923b121d8c68
parent 591ade0c96787cae5f95f980134378f484172a47
author Eric Laurent <elaurent@google.com> 1714523495 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1714523495 +0000

[automerger skipped] Merge changes from topic "revert-25262177-anon_bt_address_sc_v2_dev-CYUVCHDQFR" into sc-v2-dev am: 8dd9150b12 -s ours am: d2c6aba017 -s ours am: bd928fbb7a -s ours am: a1616ef6d1 -s ours am: 6d345cdce1 -s ours am: 591ade0c96 -s ours

am skip reason: Merged-In Idabcc84cb0f5f6f88ba5aebc435511ab95016ef3 with SHA-1 68a3c41363 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: I492c9dd5e7ece33c2b97954537f454392d062857
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>