Merge "Prepare for keeping concrete overrides of abstract methods" into main am: 189606e08d am: 54aa1241b0

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

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