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

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

Change-Id: Ia6db57986cf4d5f37108afaca66b00fe3ffc06d1