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

Change-Id: I0267b85dd768997675b6f0efccae040a942d8c92