Fix collision between service and test package name.

Change-Id: I3bf9c05b19fc4dbfd4a749ced0a9691f273c211d
Test: manual, presubmit
Bug: 227370724
2 files changed