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