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

Change-Id: I870b0e3e44be97b5a462a43318d3658e3d7d4570