Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am: 9c39da39df am: f4e2e26064
am: 8bdd94e292

Change-Id: I12e601375713fd8491007e93ae5133e3bbfd0b6c