Merge "Make keyguard showing checks more accurate" into android13-tests-dev