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

* commit 'c202e175de9ddffd9d28e999890cf001c535c2ad':
  Fix onPrepareActionMode() not being called

Change-Id: Ic46262d6d92212936ede1e33d2323602766261d3