Merge "Remove unused code" into main am: f5d35c56b1 am: 23769e58bf

Original change: https://android-review.googlesource.com/c/platform/development/+/3102525

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