[automerger skipped] AAPT2: Add supported manifest elements am: 48d009ad32 am: 840beebdb4
am: 2ce21ec52e  -s ours

Change-Id: Ibdbd577e32b7b3daff93af6587fb733aabb965ef