Merge "Fix EarlyBoot & DeviceUnlocked." am: 48a6ec275b

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1696628

Change-Id: I922be10a5c46215f5064ed60cd81cb50a44f9684