Merge "Get proper uri from filepath under cross-user root" into sc-dev am: 369f9c8815

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/15398812

Change-Id: I31889ff17e7f4b4fb90574f2ad883f113138bb20