Merge "Clean up dead code." into main am: 493aca0586 am: c6f38c78b7

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2703593

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