[automerger skipped] Enable user graularity for lockdown mode am: 5e40f39f5b -s ours am: d314c8c718 -s ours am: 0f032e1e27 -s ours am: 7c969539c1 -s ours am: 1d8a119958 -s ours am: 58e3c83314 -s ours am: 626685e5dd -s ours
am skip reason: Merged-In I4f30e56550729db7d673a92d2a1250509713f36d with SHA-1 baca9125f1 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20193625
Change-Id: I7fa7f0e904ac45dd8ba67a134bbfed1dd5cdcd2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: