Merge "Adding wait for a device file before mount" into rvc-dev am: fa94467894 am: b08bce7ffa

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

Change-Id: I1e1a4777d1466bee1f7932357f4be21b76a04c1d