Merge changes I001adb29,Ie06f6fb4,I976073ab,I7c1e2321 am: 38562c8172

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

Change-Id: I05846021027e3d8943efa806943944a2a03e856d