Merge changes I650d1072,Ia36227de am: c0da128e6d am: f15c7385df am: 9020e63278 am: d66631a359 am: e8c5460880

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

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