Merge "Revert^5 "Set block device as RO/RW before mount"" into main am: 07f97722 am: 99a59649

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3335053



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