[automerger skipped] AAPT2: Add the rest of supported manifest elements am: 00d5548355
am: aea7619420  -s ours

Change-Id: I646522c82e2c3deda01c402e3dbecee9fddc6bb5