Merge "Add framework-virtualization to combined_apis" am: 8f8b0cf013 am: e1aa081571

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2303037

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