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

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



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