Merge "Adds a content-intent-launching-activity flag to WearableExtender" into nyc-dev