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

[automerger skipped] Merge "Enable user graularity for lockdown mode" into tm-qpr-dev am: 04cbb0e2 am: 0bbfb8ab -s ours

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

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



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