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

Change-Id: Ie0877eefee8c61c95ffa16303d56c6a448933032