cherry-pick.2

nemo@nemo-HP-HDX16-Notebook-PC:~/sourcery/frameworks/base$ git cherry-pick e89ddcf5f73d8c689d48f923f21f7c69bf6741e0
error: could not apply e89ddcf... SystemUI: add signal text (1/2) WIP
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
Recorded preimage for 'core/java/android/provider/Settings.java'