Merge "fs_mgr: Harden adb-remount-test.sh on read-only filesystem" am: 9e082d49

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I274bbf4d1b42bfb59184a69e29e9e1166718dd95