Merge "[LSC] Add LOCAL_LICENSE_KINDS to system/vold" am: 810bcca4d0 am: c7c9cfbf9f am: 64d5e281ad

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1589008

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib75d7199304e2ed5da6d6145d8be1ce1f06e3327