Merge "Fix incorrect licenses in frameworks/base" am: a9e0018834 am: 5d23271049

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

Change-Id: I3a520a83124bf4c91f9e99c813423a888be625fd