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

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

Change-Id: Ib020637a9f54ec3ccd31499da2113fd00a2791b5