[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 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: I5256350dc90a18c7e3d0bc9eac6fc0db7598d10b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>