Merge changes I3349104e,Ifd86947a into android11-gsi

* changes:
  Revert property "default_applicable_licenses"
  Merge remote-tracking branch 'aosp/master' into android11-gsi