Merge changes from topic "presubmit-am-289267195037481da3696382edaa3c15" into sc-dev

* changes:
  [automerged blank] [LSC] Add LOCAL_LICENSE_KINDS to frameworks/base 2p: 784edef8e5
  [LSC] Add LOCAL_LICENSE_KINDS to frameworks/base