Merge "Retain concrete overrides of abstract methods by default" into main am:...

Merge "Retain concrete overrides of abstract methods by default" into main am: c5be9361 am: 8f9d0363 am: cc599888 am: e7aea534 am: 9dcf9c06

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2781328



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