Merge "WifiServiceImpl: Rename mClientHandler and fix incorrect usages"