Merge "WifiSettings: Add default service for @hide API" into r-keystone-qcom-dev