Merge "Add LOCAL_LICENSE_KINDS to external/strace" am: 91ca7ad713 am: a7b1c45abb am: 431bebf444

Original change: https://android-review.googlesource.com/c/platform/external/strace/+/1586055

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e867a7fc0ece4f57214a4e9b05a470c812f655f