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

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

Change-Id: I2258e68e5c4c032089d5a262ea4d56cc8be6079a