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

[automerger skipped] Merge "Enable user graularity for lockdown mode" into qt-dev am: 1eeb1758 -s ours am: 3f235889 -s ours am: ec86264f -s ours

am skip reason: skipped by user wenhaowang

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



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