[automerger skipped] Merge "Update the proximity feature to return proximity...

[automerger skipped] Merge "Update the proximity feature to return proximity levels" into tm-qpr-dev am: 253592b4 am: 39121ac2 -s ours

am skip reason: Merged-In I4d55564c39d48dd1869d747beb37f81170c102f6 with SHA-1 2419ded7 is already in history

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



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