[automerger skipped] Merge "Supplementary Services(SS) gray out when airplane...

[automerger skipped] Merge "Supplementary Services(SS) gray out when airplane mode on in Call Settings menu." into qt-qpr1-dev am: 1591d079 -s ours am: ec4571de -s ours
am skip reason: Change-Id I869a267fa5aaebf3b48f20bc70d21d612cd84586 with SHA-1 9dfd9a5f is in history

Change-Id: If7c1bc2d629464c64c3f039312f8fc40dda85001