DO NOT MERGE. ActivityPicker shouldn't grant permissions. am: f32a4fad5d am: 7c41707eaf am: 979efb53d0 am: fe1daa6eda am: efe9e7e003  -s ours
am: 47bc5fba05

Change-Id: Icf6b9c17a843608befc1250a9fdcf8a10dfa8848