Merge "WaitForNegativeProximity stopped with power button." into sc-dev am: e77889cb61 am: 0946f87c40 am: a26cb933dd am: 0af4f31337
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15611985 Change-Id: If1c183ffeb21d5f5ba0ab4b29d12ec6b0b92b7a8
This commit is contained in: