[automerger skipped] Correctly handle non-NULL terminated fuse_dirents am: 0c4d487458 -s ours

am skip reason: Merged-In I6397f368d295891b935e974858733b46e84218ff with SHA-1 aaff0c83a1 is already in history

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

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