Merge "AirplaneModePreferenceController: Fix NPE when toggle is hidden" into main am: 3eea9e53a1 am: 72943317d2 am: 99a382a05f

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

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