tree a717ca67562fc2a9760ca8d013a82683c34ffb60
parent 37c7650649a5d4c0420ebd91200925bb6b97d0fd
parent 8e8232da4c0fab3a8fb16e8f3f99ec808fd12394
author Eric Laurent <elaurent@google.com> 1714537447 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1714537447 +0000

[automerger skipped] Merge changes from topic "revert-25286114-anon_bt_address_sc_dev-EJTAFKHERK" into sc-dev am: 89eaf19e92 -s ours am: 7ce2f23072 -s ours am: 4e84c3acf7 -s ours am: d50d4714c7 -s ours am: f811d5874b -s ours am: 5ad104d45d -s ours am: 8e8232da4c -s ours

am skip reason: Merged-In I97a97fea0952227a9663e7001c9f031fb3cc725e with SHA-1 24af9bf053 is already in history

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

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