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

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

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