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

am skip reason: skipped by user paulcrowley

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559103

Change-Id: I31530ccb930095e85e69d01117ac8b66cac7a2bf