tree 6a9c08d06f7afa9934ad97c28c359e8974448c6c
parent a8ba383b20d40bdcfc1a7c19b5f61df1bacfd8fb
parent 6d345cdce1c3c286d4548430ed05f654336653bb
author Eric Laurent <elaurent@google.com> 1714522104 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1714522104 +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 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: I4ad0a33fb302a3d42d13c1643e3232e186b3efab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>