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

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

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



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