Merge "Revert "Apply colors a bit earlier when switching users"" into sc-dev...

Merge "Revert "Apply colors a bit earlier when switching users"" into sc-dev am: 29852f8a am: 187ba311 am: 87a2f341

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

Change-Id: I32b431d320f582dea481207c38e8fa332d902c15