Merge changes I604c980d,Ied97ce94 am: 430019bbb4 am: 2a4aee8a98 am: 5402e7f6bd

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

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