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

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

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