[automerger skipped] Merge "Fix race condition wen setting boot color sysprops (round 2)" into sc-qpr1-dev am: fe6f6a0110 -s ours am: a94168ee5c -s ours am: 044f1b4908 -s ours
am skip reason: Merged-In I7d304d442e3f6839ad047944cae21dc07d7c3dea with SHA-1 684b66adb2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15848684
Change-Id: I01d5ef63f293369f678043f13684d209cab8b21d
This commit is contained in: