Merge "Attempt at fixing race condition during boot." into rvc-dev am: e3a6cb22d2 am: 5c25d09202
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11898403 Change-Id: Ie929eadff4d7546c044f170cbcbbe899d1439d0a
This commit is contained in: