Merge changes from topic "anon_bt_address_tm_dev" into tm-dev am: 47007e64

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



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