Merge \"Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc.\\\" into mnc-io-docs am: c46ee88f9a am: 260e77f68a\" into nyc-dev
am: 30588da701

Change-Id: I252f462a12d2381ac01a966f5787bff9e2a60cd5