Merge "Fix license_type. Contains GPL" am: 37f1ed35 am: bfef457c am: 1cc454e5 am: 1880c624

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie1c3ec7c726dbea2e3abd9b12e43805c982c679f