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

Merge "Update permissions flags for all users before restoring" into rvc-dev am: a9d76001 am: 006be595 am: e3621890 am: 57302e96

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

Change-Id: I23ade3aa19c35ffd760be32e0e103ec058554e42