Merge "Fix adding wifi configuration issue" into tm-dev am: a12da0a8

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

Change-Id: If7f7edcd139a5f9a651c9e089380643dcd2b3bdf