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

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

Change-Id: I5319328bdc6fcf0ffa207bd592a59d1e4e4895c1