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

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

Change-Id: Id53e230eb43a691a21f57e91547f10c679660a2e