Merge "AAPT2: Support PrivacySandbox development code names" into main