Merge "Revert "Support priority based dumpsys in surface flinger""