Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev am: 9c39da39df
am: f4e2e26064
am: d563d23d26
Change-Id: Id82fbbac6455d22623355e0f4c5e24733bd5d6e3
This commit is contained in: