Merge "Add imports to networking test mapping" am: f184d40178 am: f88f3c9f08 am: 7ae5e642bd am: 6c07f1ecb2

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

Change-Id: Ib665e3d7e2ad6058c36c5d93fdc67131d2f670b5