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

Change-Id: I6c8410c9b466241e7cfee86f8a9f765ef5bc48ec