[automerger skipped] Merge "Unhide constructors of DataService and NetworkService." am: 272769c41a
am: 5d17ca309d  -s ours

Change-Id: Ib31cbe65f6ae600b6064909c4a0a43c22bd6ac40