am 3e59d689: Merge "Fixing unhold in CallsManager so it does not hold child calls." into lmp-mr1-dev

* commit '3e59d689d08b921244c0a8c2e7761a242c59a3d0':
  Fixing unhold in CallsManager so it does not hold child calls.