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

Merge "[iwlan] config for connection persistence support" am: ad5d8794 am: e29d6a62 am: 5a48285b

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

Change-Id: I0f52a6b9398a4d921c09b7e524b122f295efb689