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