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

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

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