Merge changes from topic "super-key-cleanups" am: efb59be97a

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

Change-Id: I1364f6fdd3727d1a5b0f6e13a4539cf5cbb61f91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>