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

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

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