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

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

Change-Id: I84aba15ff34e0b1ec0a6b103ad03ed02331e1b69