Merge "Move wifi.proto to shared service .jar" am: 9ca5ddff4c am: d0dcf559c5
am: f231c62802  -s ours

Change-Id: I78421f235461a8534c2b2995873f25b3c86121e8