[automerger skipped] Canonicalise path before extracting relative path am: fd3c957757 -s ours am: ae8c215d8a -s ours am: 01ec15840a -s ours am: a1c7ca807a -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/+/20942351

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