Merge "Enable user graularity for lockdown mode" into tm-dev am: 19336106

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



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