Merge "Update permissions flags for all users before restoring" into rvc-dev am: a9d76001a9 am: 006be595d8 am: 5854fad80b

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

Change-Id: I9a658a4dfb5839472ee90ccbe5c17e190f23db6d