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

[automerger skipped] Merge "[automerged blank] [DO NOT MERGE] Mount /mnt/scracth with -o sync,nodiscard 2p: 11bea35f" into sc-v2-dev-plus-aosp am: 16c96325 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If2685cdf4928c601aa01bf8aed353dfadb1e20df