Merge "Fix overlap between operator name and heads-up notification"
am: a3608c9116

Change-Id: If09c46bba04bca2e2cda99173bc53a2d7e8488e7