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

Change-Id: I4b5cf2fc84459dad8a28459c30f45b283a71605e