Merge "Fix deadlock by not acquiring lock when reporting proximity" into tm-qpr-dev am: 73eea390

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



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