Merge "WifiServiceImpl: Allow car dock app to use legacy API's"