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

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



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