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

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



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