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

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

Change-Id: I41d818c543a8fbc1df3b4051c892e605f4fa2825