Merge changes I650d1072,Ia36227de am: c0da128e6d am: f15c7385df

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

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