Bug: 167544279 Test: FrameworksNetTests CTS-Coverage-Bug: 184037351 Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f Merged-In: I5dd9b526c53cb99a5e4ae87f1e3724a7a1870e78 Change-Id: I5dd9b526c53cb99a5e4ae87f1e3724a7a1870e78 (cherry-picked from ag/14048551)