Merge changes Ibf1b8460,I16843932 am: 32cf305fc5

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1941336

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