Merge "Revert^4 "Set block device as RO/RW before mount"" into main am: 65ebd83d

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



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