Merge "Merge "Update permissions flags for all users before restoring" into...

Merge "Merge "Update permissions flags for all users before restoring" into rvc-dev am: a9d76001 am: 006be595 am: 5854fad8" into rvc-qpr-dev-plus-aosp am: 4e20412b

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

Change-Id: Id77fb631b661370541c054cefecdcfa13f84e1ad