[automerger skipped] AAPT2: Add supported manifest elements am: 48d009ad32
am: 880175990c  -s ours

Change-Id: I550c24fa455d38c1c5ffb11971a996e93d56ad63