Merge "Fix crash on "Connection preferences"" am: b75c952800 am: 3cda0e9872

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

Change-Id: Ia27ac5edeca976fbc0e34d60596566f4432e8f5c