Merge "Add proximity wakelock shell command" into tm-qpr-dev am: 504bed43 am: 44a97ca1

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



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