[automerger skipped] [automerge] Canonicalise path before extracting relative path 2p: 43b718413e am: 6157f3fdbd -s ours am: 08566311ec -s ours

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

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

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