Merge "Update WindowManager to output dumpsys in protobuf format"