Merge "Use library name rather than package name for dependencies." into main am: 950e36dbaa am: 8230c8e8bb

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

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