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

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

Change-Id: Ifa9ae6730c685c363f3a5dbf1b803bcb1efd132a