Merge "Add test for enabled adb and logcat" am: a5c3b4b730 am: f2c41f17e9

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

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