Merge "Use default implementation for onForwardingStopped() in action menu" into nyc-dev am: f25ea2f
am: 36e0945

* commit '36e09451c3c73b336a6ddb33edcd0eccc7e688fa':
  Use default implementation for onForwardingStopped() in action menu

Change-Id: Icee47b7ac6c1a5396ca65633230f4bdbde6d7c9c