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

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

Change-Id: I3023d0aa059406c7989c0799d037b32c6d153621