Merge "Fix the availability of UseOpenWifiPreferenceController." into rvc-dev am: 4ebfaec3a3
am: 38fc2238bd
am: 49c5126eea
Change-Id: Id2b29127794d108587b329b4d9c92739804f2e23
This commit is contained in: