[automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings" am: 7d8e27cbb5
am: 358e0966fc
am: cfcf58354c
-s ours
am skip reason: skipped by user jeffv Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1588487 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie23e5f0ee4a9d4e4fb2a2afbc174818528862721
This commit is contained in: