Merge "Add a test API for testing NetworkStack.getService" into rvc-dev am:...
Merge "Add a test API for testing NetworkStack.getService" into rvc-dev am: 23b888f9 am: 44689d43 am: 807b1d13 am: 7f507f0f
Change-Id: Ic9586b72191e5c8920befa1983c4c4cfed06639b