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

Change-Id: I4e41e8f9727ac536c4e82d330f0b71ba3b32e64a