Merge "Add DisplayStateController to dumpsys"