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

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

Change-Id: Ic8330575f4d11dc5cfd3ba27611af3ea9e785efe