Merge "Handle external call updates during ringing in InCallWakeLockController." into tm-dev