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

Change-Id: Ida50514aa15a056572fb401ebd4acc5b9e4c13fa