Merge "Add multi-user support for kids mode" into tm-dev am: 3ab2ecca am:...

Merge "Add multi-user support for kids mode" into tm-dev am: 3ab2ecca am: 4f89de8b am: 5308902a

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



Change-Id: I9448e9f2275dd7a8d88dc8d701c6d996f3f65dfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>