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

Change-Id: Ifd33084351941d2fe58f6534014940a18d57528f