[automerger skipped] Merge "Canonicalise path before extracting relative path" into sc-qpr1-dev am: aebeefee85 -s ours am: 9f8a7ce4fa -s ours

am skip reason: Merged-In Id620644ffdfe20e9281773e2e23851c56732dd11 with SHA-1 43b718413e is already in history

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

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