[automerger skipped] Merge "Change icon mappings in MobileSignalController" am: 34bc8d2a88 am: 2381378392 -s ours am: 25ca74d2cb -s ours
am skip reason: Change-Id Ice6e795675e0c8281531c3cf52ce181a460e4bfd with SHA-1 aa81904bd7 is in history
Change-Id: I69c3a5b354a9a2eac756e411aae23521d6075a17
This commit is contained in: