[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 skip reason: Change-Id I869a267fa5aaebf3b48f20bc70d21d612cd84586 with SHA-1 9dfd9a5f is in history

Change-Id: I1c843114e3b921e5fc4f881d4608ddd549e122b4