am 1787b4ea: Merge "Fix cancel crash" into lmp-mr1-dev automerge: 9280480
am 1787b4ea: Merge "Fix cancel crash" into lmp-mr1-dev
automerge: 9280480

* commit '928048040cb5cd205ff5e74f9393dca2371c519a':
  Fix cancel crash

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base