Merge "Prepare for keeping concrete overrides of abstract methods" into main...

Merge "Prepare for keeping concrete overrides of abstract methods" into main am: fc916490 am: 02afbeb8 am: 7adff589 am: 04e0e4e9 am: 3c082272

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>