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

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



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