Merge "Modified the AirplaneModePreferenceController for slice" into pi-dev
am: 62cd5f7f0f

Change-Id: I52220905e7a29dfc559c32ad6322a9681e390f83