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