Merge changes I1c694e5b,Ic64b5376 am: 5ab30a7008

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4e1989b9940a90c46aaac7e00e8d3578b6428a29