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

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

Change-Id: I561a69d6fa6f0fa853b31b9061062a870f586f66