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

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

Change-Id: I933be0d2b28dd9d2f1dce17e2b746dadf3b9e764