[automerger skipped] Merge "Fix race condition wen setting boot color sysprops (round 2)" into sc-qpr1-dev am: fe6f6a01 am: d7b0f79d -s ours am: 59bf0445 -s ours

am skip reason: Merged-In I7d304d442e3f6839ad047944cae21dc07d7c3dea with SHA-1 684b66ad is already in history

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

Change-Id: I6c4de6b5e52ae7f6a2e7e02151b7e6e0f4ed09d1