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

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



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