Merge "Refactor dumpsys to expose helper apis"