Merge "Cleanup quick switch shelltransit tests" into udc-dev am: fcfe8c25

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



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