Merge "Don't overwrite security params when editing saved config" into udc-dev am: ba74d655

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



Change-Id: I87cee1e5ae0505b09979f99a9ded17975d8f175e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>