tree e18e31ed6e82a07f0811adf308b61950a835bad6
parent 96637d04c3834a1bfa0146e46c0f321e7b17f02a
parent 7e932923adc5bf7ff4b2b26ceaddf9519b252164
author Eric Laurent <elaurent@google.com> 1701803764 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1701803764 +0000

[automerger skipped] Merge changes from topic "anon_bt_address_sc_v2_dev" into sc-v2-dev am: 84152b1577 -s ours am: b770486c8f -s ours am: 2948299260 -s ours am: a828a09221 -s ours am: 7e932923ad -s ours

am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 4c1d23ed19 is already in history

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

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