tree ca6a2a16cd2f4d1c4574aa3a1ee926afa352e664
parent 41df6bb2d4b5a80ed3e9909789edd0817da65620
parent bdd4495eeaef5fb93b0e20c9530803490444d4ca
author Eric Laurent <elaurent@google.com> 1714434450 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1714434450 +0000

[automerger skipped] Merge changes from topic "revert-25262180-anon_bt_address_tm_qpr_dev-DZEKTEKBCN" into tm-qpr-dev am: bdd4495eea -s ours

am skip reason: Merged-In Idabcc84cb0f5f6f88ba5aebc435511ab95016ef3 with SHA-1 68a3c41363 is already in history. Merged-In was found from reverted change.

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

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

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