[automerger skipped] Merge "[automerged blank] [DO NOT MERGE] Run check_fs...

[automerger skipped] Merge "[automerged blank] [DO NOT MERGE] Run check_fs only /data is mounted 2p: 312ad830" into sc-v2-dev-plus-aosp am: ec309bcd -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id1f819ba53203e36574d361e6dbbddcab437e7a1