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: 187460c1

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



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