Android S Beta 1
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/apache-http" am: 547e8a0103

Original change: https://android-review.googlesource.com/c/platform/external/apache-http/+/1588915

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I07406d713dc0de0992b0f3b37980d66853cbd570