Merge "Also call Intent#fixUris for the intent resolver case" into rvc-dev am: 31a2e1ba46 am: a825b17dfe

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

Change-Id: I1b9bfb11312ce16be4953a2c83887e2f8d4dd5cb