Merge "Clean up ResolverActivity.getResolveInfoUserHandle" into udc-qpr-dev