[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." am: 4b30f26d am: f91708e0 am: 6e94d2cf -s ours
am skip reason: Change-Id I869a267fa5aaebf3b48f20bc70d21d612cd84586 with SHA-1 08972c5b is in history

Change-Id: I0a30744a70aa2dcdfae283629d3e5f9c07b43c7f