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

Change-Id: I8280da25ea1dcc987d83e5eae1370707bc98b606