Merge "Fix license package name and provide license text." am: 294aeed6 am: c239aba6

Original change: https://android-review.googlesource.com/c/platform/build/+/2115689



Change-Id: I22fe27975a7cb7252ecd11dad4e0dfa6d7ae44c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>