Merge "AAPT2: Fix typo in manifest validation expectation" into oc-dev am: 7cf8ca95aa
am: f43dd4b032

Change-Id: I672916a11b83dea83ae9ea0048a4c22747b53733