Merge "Try erofs when mounting OTA partitions." am: 0b6974be am: 699fa040 am: 082b5271 am: 37f86ed8 am: 7fc9ab84

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



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