Merge "Update permissions flags for all users before restoring" into rvc-dev am: a9d76001 am: e13462e3 am: 7797772b

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

Change-Id: I9fae1733f12dc635263e091e4be5c86b5c89af46