Merge changes from topic "cukie-2genterprise-user-restriction" am: 6c70a328...

Merge changes from topic "cukie-2genterprise-user-restriction" am: 6c70a328 am: b1a26bf5 am: af4dee0c

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



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