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

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

Change-Id: I46ad006bdb3700ac4cba29711db589e5afaca448