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

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

Change-Id: Icc53036eb6b3a26408dcd6ed2b6e2e509a520e8c