am 845b3fb7: Merge "Recalculate in-call state when activity ends." into klp-dev

* commit '845b3fb72cd3dc3b4d042767d18dedb983ff4b47':
  Recalculate in-call state when activity ends.
tree: acfd6a607c17ae0d926dcf6d008695ad4009788e
  1. InCallUI/