Partially revert ag/17294635

The qualified network service change was accidentally
merged in ag/17294635. It should be merged in a different
CL. Revert back to the previous version.

Bug: 171809764
Test: Build
Change-Id: Id50e376c04141a347ff70cdc7ab7ad1fab661844