Merge "Clean up dead code." into main am: 493aca05 am: c6f38c78 am:...

Merge "Clean up dead code." into main am: 493aca05 am: c6f38c78 am: 072b162b am: 8c07382e am: fcdae08f

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



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