[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 skip reason: Change-Id Id96c4b76bd6a5e4321489dacb32dcacd462aef46 with SHA-1 f283614f is in history
Change-Id: Ib8eaa215635c0f88de5c8bd83affbc367c9aa8ad