[automerger skipped] Enable user graularity for lockdown mode am: 0b56ec9aa2 -s ours am: 0479a2be4d -s ours am: 89694ee6b0 -s ours am: 005d951aab -s ours am: 3d47189a9b -s ours am: 321e595e64 -s ours

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

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

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