[automerger skipped] Merge changes from topic "anon_bt_address_sc_v2_dev" into...

[automerger skipped] Merge changes from topic "anon_bt_address_sc_v2_dev" into sc-v2-dev am: 84152b15 -s ours am: b770486c -s ours am: 29482992 -s ours

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

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



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