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

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

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