Merge "Move wifi.proto to shared service .jar" am: 9ca5ddff4c
am: d0dcf559c5

Change-Id: I7c0095922c87073732f29b623aee2d99608511cf