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

* commit '15dd2e6f5c2e303877353dd72ceb199f6bba03e6':
  Recalculate in-call state when activity ends.
tree: 0979bb2cbfde2f0030753d2ee4bd71493ddb0df3
  1. InCallUI/