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

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



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