Merge "Merge "Do not show unreachable APs in QS Wifi Picker." into oc-dr1-dev am: 6628e48a1f am: 701215725e" into oc-mr1-dev-plus-aosp
am: 1d9cefdf16

Change-Id: I650a06fb1199651f5f5966ebec2fac7abe2dce16