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

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

Change-Id: Ic5380afe9d9bf209ca8a14c81c28a7e51c6bc238