Merge "Correctly implement multi-user theming support" into sc-v2-dev am: 8f2f9a2f am: 5e5fd4e0

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

Change-Id: I911ec406c63fa7de345e786b860691f0d2ceb21f