Android S Beta 2 (SPB2.210513.007)
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/mtpd" am: 2c7cca207c

Original change: https://android-review.googlesource.com/c/platform/external/mtpd/+/1588898

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id5e3a6b86f55e6883ee50cda3d6bd1d24f517fbf