Merge "Fix onPrepareActionMode() not being called" into nyc-dev
am: 9412176

* commit '94121762ff47728fd8080f45f04cafb55b92079d':
  Fix onPrepareActionMode() not being called

Change-Id: Ib8accfd3ffafefd963a7d2d8b09e3a2d5cf26a34