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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I53854fe077323889c12511db95c0fdf2c9d140b4