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