Merge "Better heuristic to find license types" am: 7cf8a749fb am: 60c4d996bc

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

Change-Id: I2241b6f03b308818d2253cc1c5916af338d99442