[automerger skipped] Merge "Supplementary Services(SS) gray out when airplane mode on in Call Settings menu." into qt-qpr1-dev am: 1c1c602f48 -s ours am: 6b27c9eaf7 -s ours
am skip reason: Change-Id I8f75dd0f3b8d63f9ce787921cc3e739f82528167 with SHA-1 022b5da707 is in history

Change-Id: Ida4e16c18c16dce0ae6dc8ed80f9aac948e79616