Merge "Fix KeyguardTests flaky on verify dismiss callback." into stage-aosp-sc-ts-dev