Merge \"Merge \\\\\"docs: Fixed option for \\\\\"launchMode\\\\\" within Android manifest doc.\\\\\" into mnc-io-docs am: c46ee88f9a am: c59557649c am: 29df77dd86 am: 92cdc875ca\" into nyc-mr1-dev-plus-aosp
am: 5edc09ff7e

Change-Id: I53248efa275d6b03c4db8217ce6877dcb974825c