[automerger skipped] Merge changes from topic "anon_bt_address_tm_dev" into tm-dev am: 47007e641f am: a277b539c1 -s ours

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

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

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