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: Ic2abd0da8dd45fbd6edf21a74ab338733e4ab349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>