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

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

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