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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3603f80ba9f80406c2b61446e894918ae42655d1