[automerger skipped] Merge "Fix rename bug via FUSE" into mainline-prod am: 382ec8b7e1 -s ours am: a085e21c61 -s ours

am skip reason: Change-Id I839e237757c9b8afca9152dc9bedf0e1b2121817 with SHA-1 2456e8e1e0 is in history

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

Change-Id: Iced96ca445693bce95b1ed94e4682b42920777fd