[automerger skipped] Merge changes from topic "anon_bt_address_sc_dev" into sc-dev am: 840901500e -s ours am: 680709cf3d -s ours am: 39a185c6ba -s ours am: 55d75e3bc5 -s ours am: de8816c27a -s ours

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

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

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