[automerger skipped] Merge "Fix race condition wen setting boot color sysprops (round 2)" into sc-v2-dev am: e23dd065 am: 1d9da2f3 -s ours

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

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

Change-Id: I9f014c1cd77cd4d690fc28d7952f50d4ff41b2d3