Merge "Attempt at fixing race condition during boot." into rvc-dev am: e3a6cb22d2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11898403

Change-Id: I473b80c85015d0ec8f342440d5a62b40153bd27f