Merge "Fix KeyguardTests#testScreenOffCausesSingleStopAod" into sc-dev