Merge "DO NOT MERGE Add LOCAL_LICENSE_KINDS to frameworks/base"