Merge "[iwlan] config for connection persistence support" am: ad5d879455

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350663

Change-Id: Iddae67f19e16a6698441550eb296219133bc85eb