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