[automerger skipped] Merge changes from topic "anon_bt_address_sc_qpr1_dev"...

[automerger skipped] Merge changes from topic "anon_bt_address_sc_qpr1_dev" into sc-qpr1-dev am: fefdc2b7 -s ours am: 09eece19 -s ours am: 5029b24e -s ours am: 757e33e5 -s ours am: 503812be -s ours am: 15e37dc8 -s ours

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

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



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