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

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

Change-Id: I71bbddf1c3d4aecf2293c090d72879eb84e601a8