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

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

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