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: I1e506af6a2cbc741bf83cfef02f0f355324ddbb1