[automerger skipped] Merge "Enable user graularity for lockdown mode" into qt-dev am: 1eeb1758fd -s ours am: 3f2358892f -s ours am: ec86264fcb -s ours am: 69b752610f -s ours

am skip reason: skipped by user wenhaowang

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

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