Merge "Merge "Also call Intent#fixUris for the intent resolver case" into...

Merge "Merge "Also call Intent#fixUris for the intent resolver case" into rvc-dev am: 31a2e1ba am: a825b17d" into rvc-d1-dev-plus-aosp am: 3cfe1e9b am: 803648e9

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

Change-Id: I3ba76f1ccb568ddf1e55160a60d3e70666d5cd07