Merge "Revert "Apply colors a bit earlier when switching users"" into sc-dev am: 29852f8aa0

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

Change-Id: Ifa864403e647b2da9916a80516b22abe9dfca4e4