tree 12b5693e83898d5f595bca238334b7d36f59850b
parent a5ee4384034ef8bb4eeba3660107cb10d628dc9c
parent 5ad104d45d28834aaec5f8d1c5c7b22c32ca5afe
author Eric Laurent <elaurent@google.com> 1714536131 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1714536131 +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 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: I8acf2d5438ba8571e66eaf2390d3d6e303170549
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>