[automerger skipped] Move override logic from SysUI to Telephony am:...
[automerger skipped] Move override logic from SysUI to Telephony am: fc294b1a am: eaa598e4 -s ours am: 7e3b49dc -s ours
am skip reason: Change-Id Id96c4b76bd6a5e4321489dacb32dcacd462aef46 with SHA-1 f283614f is in history
Change-Id: I616255d1e6964c1f3352205016e9f4d95f7d06dd