[automerger skipped] Merge "Removed the obsolete code" into main am:...

[automerger skipped] Merge "Removed the obsolete code" into main am: a012db21 am: ffa70570 -s ours am: de0b5eab -s ours am: d33e4669 -s ours

am skip reason: Merged-In I1e0dd566114550099de3e0d0eedfcab79c4e54b6 with SHA-1 53129a70 is already in history

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



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