Revert "SystemUiSettings.java: fix conflict"

This reverts commit 12af4e7be3ecb1033e56e3fb2e15e883b8260ce3.