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