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

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

Change-Id: I884e15fce160a4cdefbad3418bfe6213f1977a1e