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

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

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