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

Change-Id: I62648707af7311a2a7ab1ea17a58fd96b0b4900d