Merge "Fixes type resolving in ActivityManagerShellCommand" into udc-dev