Merge "Merge "Allow Instant Apps to call getPermissionControllerPackageName" into oc-dev am: 88f98985d5" into oc-dev-plus-aosp