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