Merge "Apply colors when a non managed user is added" into sc-dev am:...

Merge "Apply colors when a non managed user is added" into sc-dev am: 0af45385 am: e889177c am: e0c34255

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

Change-Id: I0cae7ee95626ff9f537b85afbbe91a569b125ddc