Merge "DO NOT MERGE Add LOCAL_LICENSE_KINDS to frameworks/base" am: 0cfaf8aa1c am: a184c0e820

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

Change-Id: I32736053135d6bd19e9cceb6cf512105020a8a85