Merge "Fix KeyguardTests#testScreenOffCausesSingleStopAod" into sc-dev am: c4c7e0b47e am: 1fd12a80bb am: 866f2aa92a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15476108 Change-Id: Ic4b679623687da85dcb7bb7e1861d5ac75108731
This commit is contained in: