Merge "Remove last NetworkStack usage of hidden APIs" am: 16ec5d038c am: 4845df3ced
am: 14062be8f2

Change-Id: I2059d9cfa3015388301a74828255354b6dc23c23