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: I574a4cfd22bccde02edbf0b9e743d60aff021917