Merge changes from topic "actuallyUsePermissionControllerToRestoreBackup"

* changes:
  Inherit state into split permissions
  Be careful what state to restore
  Correctly backup granted state for pre-M apps
  Backup if a permission of a pre-M app was reviewed
  Do not backup and restore revoke-on-upgrade
  Move permission restore code into permission controller.