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: e13462e3 am: 7797772b am: 5f7eb79b

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

Change-Id: I61087027445812f93cd7e20ad217dec035eea2ce