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

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

Change-Id: I43c9234268d17bfaa870ef9a7774a727970541f8