[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: 69b75261 -s ours am: 401eb939 -s ours am: 35bd1367 -s ours am: 686603f6 -s ours am: 6ec31224 -s ours

am skip reason: skipped by user wenhaowang

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



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