Merge changes from topic "anon_bt_address_udc_dev" into udc-dev am: 17bc7f4b

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



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