Merge "Add an fstab entry for erofs postinstall" am: 3c93569dc6 am: 82ad8370aa

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2080798

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