Merge "[iwlan] config for connection persistence support"