[automerger skipped] Merge changes from topic "anon_bt_address_tm_dev" into...

[automerger skipped] Merge changes from topic "anon_bt_address_tm_dev" into tm-dev am: 47007e64 am: ff08b3c5 -s ours am: 0608126d -s ours

am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 665342c5 is already in history

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



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