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

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

Change-Id: If8113606ca54bb036bc2b5660ad19eb2d566642f