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

Change-Id: I1c87d7f2e8ccb8183eba4ef26cf20a4cb515b88b