Merge "Prepare for keeping concrete overrides of abstract methods" into main am: 415773ed06 am: 31e55bbe5a

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2781647

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