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

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

Change-Id: I418f77abc093c192fce07c3c9e264478c4a789b7