Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/apache-http" am: 547e8a0103 am: 0dc2775c3c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I805a59847f4aa313a0916203a6628bbde2a455ab