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

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



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