Merge "WaitForNegativeProximity stopped with power button." into sc-dev am: e77889cb61

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

Change-Id: I6bffb7979985239472d0b75dd7256bb40ae1f1da