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

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

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