Merge \"docs: Fixed option for \\\\\"launchMode\\\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480 am: 15865b5c67 am: 83cd591aa2\" into nyc-mr1-dev-plus-aosp
am: 44277c919a

Change-Id: I502a165c329f2af7634428cbcd5cf6a8b55d5b4c