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

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

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