Merge "Fix KeyguardTests#testScreenOffCausesSingleStopAod" into sc-dev am: c4c7e0b47e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15476108

Change-Id: If5f1edc07b6f8b5db0033ba0ad3df84d323889e5