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

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



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