Merge "Revert^3 "Set block device as RO/RW before mount"" into main am: 8cd0f23d

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



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