Merge "Merge "Update permissions flags for all users before restoring" into rvc-dev am: a9d76001a9 am: 006be595d8 am: 5854fad80b" into rvc-qpr-dev-plus-aosp