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

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

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