Merge "Collect Uri grants for startActivities()." into rvc-dev am: fe1d660cce

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932141

Change-Id: I5ce155fe3e0bb156bfd93482e038c885c8c3dc15