1) "ComponentName" + "States:" Sometimes confuse developers
(e.g: OneHandedControllerStates)
2) The indent of OneHandedSettingsUtil is incorrect
Test: adb shell dumpsys activity service com.android.systemui
Test: make
Bug: 187014022
Change-Id: Icca01221986efdf9a1f9975efa30e485c5be36b0