Merge changes I604c980d,Ied97ce94 am: 430019bbb4

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

Change-Id: I587fd72e423a6b27b2e12b24728f2f5111839341
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>