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

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

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