Merge changes I3f1e81c1,I1a95efa5,I3b5d6732 am: baa862bd76

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

Change-Id: Ief3bc0e13a2af719630675f98a12a476b5c0e259