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

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

Change-Id: I1281c9c9dba668119f59ad3e857057c505817525