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

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

Change-Id: I4066618a8e9dfc15d44f0867c139cb0fbc58029c