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

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

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