Merge "Fix race condition wen setting boot color sysprops (round 2)" into sc-qpr1-dev am: fe6f6a0110

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

Change-Id: I55b7e0c3f5b93d21bec30052f98a482d502c10ee