Merge "Remove unused code" into main am: 5b257c6923 am: bfe6762a42

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

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