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

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

Change-Id: I6d0bfa342168c5d01a3e3a1edc42eb02264800cc