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

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