Merge "Use library name rather than package name for test dependency." into main am: 65177d2f74 am: 81f5607321 am: 53167d2834

Original change: https://android-review.googlesource.com/c/platform/development/+/2852605

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