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

* commit '6ade4d106717fbeefaf011253abae1bb37a4425a':
  Fix onPrepareActionMode() not being called

Change-Id: I90d3586dd041776e0dafc2880a321169a8561dbf