[automerger skipped] Merge "Fix deadlock by not acquiring lock when reporting...

[automerger skipped] Merge "Fix deadlock by not acquiring lock when reporting proximity" into tm-qpr-dev am: 73eea390 am: a308ea5a -s ours

am skip reason: Merged-In I9f7d520cbcfd57032a9476853acad025fd7a6b95 with SHA-1 a28af297 is already in history

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



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