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

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

Change-Id: If8b1669abd19613c055bf7fe7435fb226bf59ae8