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

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

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