Merge "aapt2: Preserve annotation parameters for SystemApi." into rvc-dev