Merge "Update netId to nethandle mapping in NetworkTest."
am: a04d0cc72f

Change-Id: Ie4524e17f1839bae832d03248a2208693b1b1e95