Merge "Remove redundant code." into main am: 7537f7c9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3509550



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