Merge changes I28d293a5,Ic5c7601b am: d3e248434f

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

Change-Id: Idc79164a2e7674dd991536141aa807cbbe3a9de2