Merge changes from topic "aapt2-manifest-elements"
am: e75f2f504e

Change-Id: Id4ba91518c3160f936325454814d35bde7f60496