Remove usage of hidden APIs

Remove usage of hidden core/net APIs

Test: build
Bug: 137202333
Merged-In: I9660dfe6cd6b5a1faf046ad739d93e17c59e9a3d
Change-Id: I9660dfe6cd6b5a1faf046ad739d93e17c59e9a3d
2 files changed