Merge "Add imports to networking test mapping" am: f184d40178 am: f88f3c9f08

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1461982

Change-Id: If6e2aec576eea261aa648cc027e4047c99363841