Merge changes I650d1072,Ia36227de am: c0da128e6d

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

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