Merge "Try erofs when mounting OTA partitions." am: 0b6974be am: 699fa040...

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

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



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