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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I651a6397296021da20b4236c3e385965dcc320a6