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: I8e157b22b287a84fc4e579552be816a51b4cb862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>