Merge "Fix crash on "Connection preferences"" am: b75c952800
am: 3cda0e9872
am: 32129f14f5
am: e0347c87fd
am: f8f8cc870f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1485157 Change-Id: I67c9d77815b2ff63e902d99aef958e4c179d0487
This commit is contained in: