Merge changes from topic "cherrypick-final-32-khu88k0v6u"

* changes:
  Update @RequiresApi declarations for T to be 33.
  Update AAPT for S V2.