[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: 401eb93909 -s ours am: 35bd1367af -s ours am: 686603f686 -s ours am: 6ec31224b4 -s ours am: 3a23c94ad1 -s ours

am skip reason: skipped by user wenhaowang

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

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