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