[automerger skipped] Canonicalise path before extracting relative path am: cadac8cdf4 -s ours

am skip reason: skipped by user abkaur

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

Change-Id: Ic1b39030d4a9959cd03bbf67c14c1e548f3dee1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>