[automerger skipped] Merge changes from topic "anon_bt_address_tm_qpr_dev" into tm-qpr-dev am: f929698156 -s ours am: 42da3822a5 -s ours

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

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

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