Merge "Try erofs when mounting OTA partitions." am: 0b6974be81 am: 699fa0400c am: 082b527108

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2469753

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