Merge "Disable proximity result for hotword" into tm-qpr-dev am: 4e528edd am: c031c0fe

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



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