[automerger skipped] Revert^2 "Add proximity state to the...

[automerger skipped] Revert^2 "Add proximity state to the HotwordDetectedResult" am: aa972f2c am: 1c307b4e -s ours

am skip reason: Merged-In Ife5fb9220518a32a89494217f56932f290cce5f3 with SHA-1 e601349c is already in history

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



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