Merge "Remove incorrect/confusing Certificate use" into main am: e4758f7009 am: 9c42a0e8de

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

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