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