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

Change-Id: I617de6384545e3ca6050d9c7b829397c0dfcb1a2