Merge "Removed the obsolete code" into main am: a012db21

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



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