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

Merge "Support more dependencies for license metadata." am: d1751847 am: e13c9771 am: c8e59981 am: b9600415 am: 3ce673ee

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



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