Merge "Attempt at fixing race condition during boot." into rvc-dev am: e3a6cb22 am: 5c25d092 am: 8659857f

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

Change-Id: Ie1c2bae56719bc39c182f96810743be037c6a3fa