With b/391766151 fixed by the previous patch, this can now be reverted. This reverts commit 4f59de2f85. Test: atest NetworkAgentTest on an S device Change-Id: Ie2cb2ca5653a134c0eaa1cac5b0c4b4221f1c0ac
4f59de2f85