Merge "Have isRinging return true when simulated ringing"

                    // current state as tracked by PhoneStateBroadcaster, any failure to properly

                    // track the current call state there could result in the wrong ringing state

                    // being reported by this API.

                    return mCallsManager.hasRingingCall();

                    return mCallsManager.hasRingingOrSimulatedRingingCall();

                }

            } finally {

                Log.endSession();