Merge "[automerger skipped] Merge "Test NetworkStack.getService" into rvc-dev...

Merge "[automerger skipped] Merge "Test NetworkStack.getService" into rvc-dev am: cb16fcd4 am: 307ca073 -s ours" into rvc-d1-dev-plus-aosp am: 15cd3387 -s ours am: 9087493a -s ours

am skip reason: Change-Id I937c7cceaed3e2ea8a3d7c4d187890a6e9fdcd28 with SHA-1 44045918 is in history

Change-Id: I40edfde43372a47b3ad8a96ef439a7ae5e8de9d3