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

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



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