Merge "AirplaneModePreferenceController: Fix NPE when toggle is hidden" into...

Merge "AirplaneModePreferenceController: Fix NPE when toggle is hidden" into main am: 3eea9e53 am: 72943317 am: 99a382a0 am: dcd5c3ea

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2767862



Change-Id: Ic48cfef3f29f8ba4d8512c73334eb006a8ff2c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>