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

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

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