Merge changes from topic "aapt2-warn-manifest-validation"
am: 61f92e7e13

Change-Id: Idb04f6750abd4dbdce62979794f68833a39e4c3b