Merge "Adds a content-intent-launching-activity flag to WearableExtender" into nyc-dev am: a5ec16e3
am: 9f1e6de0
* commit '9f1e6de0':
Adds a content-intent-launching-activity flag to WearableExtender
Change-Id: If09863a35440db6b0fc10c021226c9b61b52283f