Merge \"docs: Fixed option for \\\\\"launchMode\\\\\" within Android manifest doc. am: 7ce51cf350 am: 22be9b1a87 am: b65288fcb5 am: c0c9e529db\" into nyc-mr1-dev-plus-aosp
am: 2f7b99f6c3

Change-Id: I5084605d402e557c739c12f5e2815c9095868cc5