Merge "Provide a way to override the avoid bad wifi configuration" am: 38e8c2c94b

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733788

Change-Id: I48af839ba2a8f2e7531aa9a897ad7a1d00f8a676