Merge "Handle EIO error in FUSE readdir" am: ccc6af758d am: 7972e52662

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb56a0391c16faa71c98896a92f30d8ffafcec5d