Merge changes I4a13082a,Iccaf0bff am: 5f6bc22323

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I50d150ab827123b14b4098c661170f7917c70d72