[automerger skipped] Don't set user restrictions directly on USER_ALL. am: fd5af1b03c am: 607434090e -s ours
am skip reason: Merged-In Id71b1fb3af41afe722d336d33628bc1b222205c8 with SHA-1 fd5af1b03c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21518370
Change-Id: I73fb7828111705cd747ffbb8e6c8548378cc7023
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: