Merge "Update the proximity feature to return proximity levels" into tm-qpr-dev am: 253592b4

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



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