[automerger skipped] Canonicalise path before extracting relative path am: 1426f04cd2 -s ours am: bfdecca38f -s ours

am skip reason: Merged-In Id620644ffdfe20e9281773e2e23851c56732dd11 with SHA-1 0f59f42685 is already in history

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

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