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

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



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