[automerger skipped] Merge "DO NOT MERGE Add LOCAL_LICENSE_KINDS to...

[automerger skipped] Merge "DO NOT MERGE Add LOCAL_LICENSE_KINDS to frameworks/base" am: 0cfaf8aa am: a184c0e8 am: 789850e9 -s ours am: 0f3f55bb -s ours

am skip reason: subject contains skip directive

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

Change-Id: I94226769ea20e0f446ea81e9234128d307827c46