Fix collision between service and test package name. am: 92fec66ae6 am: c3dad330fd

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/OnDevicePersonalization/+/17529468

Change-Id: I807837a7094c9694e1503094a6d4ce8ddf14d4d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>