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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I386043c4ef31e5f0239bd0818725e3d5791554ed