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: I9a9f50d86a42ec0afb2c4c53370fc641c8f48b87
This commit is contained in: