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

Change-Id: I488fc028b8fd2aa5a09464082c65a4889a8a6b62