Merge "Fix a crash when changing preferences" am: aeb051b962

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

Change-Id: Ifa0249c059488029e5e8902cd7bbece06a6d54f2