Merge changes Iff862198,I5c219d29 am: 79261a4454

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

Change-Id: I3e82476d50c123bac599c588c801cd96dcda7d2b