Merge changes If3217916,I86023b1f into main

* changes:
  Add java_defaults for @FlaggedApi handling
  Prepare api directory for udc mainline branch