Merge "Remove BACKUP_DATA permission and associated checks"