Merge "[automerger skipped] Merge "Fix for TestDirectBootEmulated testcase" into android11-tests-dev am: ec568a975c -s ours" into android12-tests-dev