Merge "Fix crash issue when NetworkSelectSettings UI goes OFF and then ON" am: b086fed657 am: 00eaf3f7e0 am: fef782861a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05a62b623436440c077018d11d6d27a1d3ec63f6