[automerger skipped] Merge "Fix incorrect text when on Airplane Mode" into...
[automerger skipped] Merge "Fix incorrect text when on Airplane Mode" into qt-qpr1-dev am: d2469209
am: 3de35400 -s ours
am skip reason: change_id I9d83b0eb2a21b786d50c243903bf32b6e761dc77 with SHA1 0f49f207 is in history
Change-Id: I5655674979bc8be6acc5ec9202c713a47a01249c