[automerger skipped] Fix a crash when changing preferences am: 5234f3acc6 -s ours

am skip reason: Merged-In Ia482e6fbf2bf300ce6cbaca72810d394ed201b98 with SHA-1 9473c984b8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15461334

Change-Id: I1fc9639d0ac20314812f3e2c6ca1d1bd27cdae40