Merge "Enforce DUMP permission on BackupManagerService's dump() method"