[automerger skipped] Merge "Fix NPE in AudioSwitchPreferenceController" into...

[automerger skipped] Merge "Fix NPE in AudioSwitchPreferenceController" into 24D1-dev am: c4c5ad56 -s ours

am skip reason: Merged-In Ic97d1a6269a6d98ffd15a9b512f6ae24ff1c5b5e with SHA-1 7ac80f0a is already in history

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



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