Merge "Fixes type resolving in ActivityManagerShellCommand" into udc-dev am: a129baf1 am: bc6be2a4

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



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