[automerger skipped] Canonicalise path before extracting relative path am: 132ac4912e -s ours am: a43d3a4b1a -s ours am: a5d29f9648 -s ours am: dd04def242 -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: Icc57a50c56986213312f98a0999f1b6cb85f5cf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>