Merge "Merge "Fix onPrepareActionMode() not being called" into nyc-dev am: 9412176 am: c202e17" into nyc-mr1-dev-plus-aosp
am: 39c3704

* commit '39c3704e5ab874407d381ea5833c8e76a9cc1cf2':

Change-Id: I5d3426920f0f05ff1df80ae9220cabf56b484b38