Merge "Fix KeyguardTests#testScreenOffCausesSingleStopAod" into sc-dev am: c4c7e0b47e am: 01681509df am: 713ea70c78
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15476108 Change-Id: Ie1178309e67122a7729dc0d9870fab7c8b7c0c44
This commit is contained in: