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

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

Change-Id: Iece9ab186b1917ac19bd3b79697a0c2e427e2bb6