Merge "Support more dependencies for license metadata." am: d1751847 am: e13c9771

Original change: https://android-review.googlesource.com/c/platform/build/+/2043296



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