Merge changes from topic "displayinfo"

* changes:
  Move override logic from SysUI to Telephony
  Added telephony display info support