Merge "Fixes type resolving in ActivityManagerShellCommand" into udc-dev am: a129baf1 am: d150d83d am: 3c38f195 am: 5d12c14c

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



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