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

Change-Id: I38b5e21cb9f8667dd8b7ed6273f97219ef8a48b9