Merge "Fix license_type. Contains GPL" am: 37f1ed3523

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1557004

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46b07791efa3afc421fac3b11b28c5c901ba4d18