Merge \"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480\" into nyc-dev
am: aa57295104

Change-Id: I87db649cfa3c4ea702cb0b0ae40d65aec2cc5619