Merge "Rename dumpsys protos to make platform proto names consistent."