[automerger skipped] Merge "Fix overlap between operator name and heads-up notification" am: a3608c9116 am: 5013f1c08c
am: 12340d1d32  -s ours

Change-Id: I48485d3f60f53822fc79806f52154725174be8f8