[automerger skipped] AAPT2: Add the rest of supported manifest elements am: 00d5548355 am: 6ffa32f13d
am: 732463d058  -s ours

Change-Id: I250a4c6bcf5bee399f8a7ac9b20da1f6e43b55e4