Merge "Add USE_CUSTOM_VIRTUAL_MACHINE permission to Shell" am: 87e124332d am: ea4f257004 am: e0ceb9de72

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

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