Merge "Fix for TestDirectBootEmulated testcase" into android11-tests-dev