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

Change-Id: I4b0dc391b85229f1668c73fad94b463984bfe46c