am 6184a2ad: Merge change 5339 into donut

Merge commit '6184a2ad42ee7b83f9db5a6fd9c99013a914c49e'

* commit '6184a2ad42ee7b83f9db5a6fd9c99013a914c49e':
  Fix intermittent crash related to call waiting