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