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

Change-Id: I27f4a83acdcd57fa1bb48fd7f91cce75d5cf6c8d