Merge "Fix race condition when setting boot color sysproprs." into sc-qpr1-dev am: 5541e5a2 am: 55290e4d

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

Change-Id: I7949eb50dc900a501d3ec87fd195dd7fbdda6079