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

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

Change-Id: Id230be2f835aa5eeae98e2030d14acb2fe0e5acc