Merge "Enable passing tests and delete shelltransit class" into udc-dev am:...

Merge "Enable passing tests and delete shelltransit class" into udc-dev am: 2c2a2cf0 am: 443acdce

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



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