tree f53c6a0da29368c1ebd9f20524eafb740af00023
parent a85a29c3a6018b8df5e6b0ce7271a6fd7f123e56
parent a828a092215978a014ec10e747a12833ee2373ee
author Eric Laurent <elaurent@google.com> 1701798084 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1701798084 +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 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: I710f52ce80f0a2e096fe52a002158d35c29d778f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>