[automerger skipped] Merge "Adding wait for a device file before mount" into...

[automerger skipped] Merge "Adding wait for a device file before mount" into rvc-dev am: fa944678 -s ours am: a2434bf9 -s ours am: 78d32f3f -s ours

am skip reason: Change-Id I74a68224073932773be18a79f9334d83ea5b6947 with SHA-1 f044f2d4 is in history

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

Change-Id: I08bf4ea6813a31b3f51b042de1abf528e6afd571