am 1aab56ce: Merge "Implement granting of URI permissions from picker.  DO NOT MERGE." into gingerbread

Merge commit '1aab56ce88d0b85da319e2b54ab506cd03d102e0' into gingerbread-plus-aosp

* commit '1aab56ce88d0b85da319e2b54ab506cd03d102e0':
  Implement granting of URI permissions from picker.  DO NOT MERGE.