Merge "aapt2: Preserve annotation parameters for SystemApi." into rvc-dev am: 924069c2 am: d7bc5846 Change-Id: I9a0f07743775106d69eebe3486999465a7c9c4d5