[automerger skipped] Merge "Enable user graularity for lockdown mode" into...

[automerger skipped] Merge "Enable user graularity for lockdown mode" into tm-dev am: 19336106 am: 79ba30d6 -s ours am: ff5b80ff -s ours

am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 ccead088 is already in history

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



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