am fe22c504: am f2be271d: Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long.

Merge commit 'fe22c50410029eaf37f3e8e910a8c5fdd5769c70'

* commit 'fe22c50410029eaf37f3e8e910a8c5fdd5769c70':
  Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long.
tree: fbb6fab05dc4e8f99975376e1f69e2150e44d20e
  1. policy/