[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 am: b08bce7f -s ours am: 7d12643a -s ours am: e71dbf91 -s ours

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

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

Change-Id: Idfd71e091cfdbc34b14c6bae772549e6ff6edb17