[automerger skipped] Canonicalise path before extracting relative path am: 0f59f42685 -s ours am: fa6de0bdbf -s ours am: 7339beeed5 -s ours am: bb4128806b -s ours am: 88a7b66d57 -s ours am: 3296ce9063 -s ours am: c8c6894e49 -s ours

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

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

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