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: ed9e38ab am: 8a67d2ec

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

Change-Id: Iaa843ba66f6bbca0367a8a7f125f8222abf1ebe3