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

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

Change-Id: I50a1ea8fe3afe21ee5c1bff3156080f300b98cf0