Merge "Remove dead code." into main am: 5bc39c1637

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/3017379

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