Merge "Some refactoring for the ShareActionProvider sample." into nyc-dev
am: 7f29a15d53

Change-Id: Ibb7bf935aeb8de240de42818d84507e73d316168