Merge "Add erofs to supported fs type" am: 8571b76185

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1517501

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b80de12a663a61a83232fce701802e9089eb5b7