Merge "Prepare for keeping concrete overrides of abstract methods" into main am: fc9164906e

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

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