Merge \\"Adds a flag to Action.WearableExtender to display actions inline on Wear\\" into nyc-mr1-dev am: 795265513c
am: ea235e8d92  -s ours

Change-Id: Icb8d8b53a1e4d14a6cc33370cb5f8d05dc29881f