[automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base"...

[automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: be72f04d am: 3367ce2c am: 95bbf598 am: f4466a1c am: a37aa85f -s ours

am skip reason: Merged-In I276cd2c4c2fb077165f21442230f30e2d8adbe76 with SHA-1 92d8fc09 is already in history

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



Change-Id: Ib526927922bc6341feeef1ce3f7dedca5e127535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>