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

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

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