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

Change-Id: Ifc85ffb37f139cd499fd2ebef4cfc6f6d9fcd932