[automerger skipped] Merge changes from topic "anon_bt_address_sc_qpr1_dev" into sc-qpr1-dev am: fefdc2b7de -s ours am: 09eece1912 -s ours am: 5029b24ea3 -s ours am: 44dd043eb2 -s ours

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

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

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