[automerger skipped] Merge "[iwlan] config for connection persistence support"...

[automerger skipped] Merge "[iwlan] config for connection persistence support" am: ad5d8794 am: e29d6a62 am: 5a48285b am: 02fc087d am: b26b44f9 -s ours

am skip reason: Change-Id If328b6e1467095e059e532f55e0062211b7c80c9 with SHA-1 846b17a1 is in history

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

Change-Id: Ifaa27e13f7aa544a3abae9e0bb2e7c13bf2f9b36