[automerger skipped] Merge "Add a test API for testing NetworkStack.getService" am: d4373f3a54 am: f7a9a48a2a -s ours

am skip reason: Change-Id I04058a007f2dfe1044cabeb3ac508404873665ad with SHA-1 fc9119df29 is in history

Change-Id: Id7c9132b34c6b67c2c6cb0821490383c584cc88e