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 am: 22b54a82

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



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