Merge changes Ibc7851ba,Ie743cff7 am: ce8c6af02a

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

Change-Id: I531a97df9a4e216371c4bbff8a7c5b8129efac2a