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

Change-Id: Ieaf5d7bdb7bd870160ce2144de1b0f890ff5370e