Merge tag 'android-security-15.0.0_r12' into 3862-a15-december

            Log.i(this, "notifyTimeout: call redirection has timed out so "

                    + "unbinding the connection");

            if (mConnection != null) {

                try {

                    // We still need to call unbind even if the service disconnected.

                    mContext.unbindService(mConnection);

                } catch (IllegalArgumentException e) {

                    Log.e(this, e, "Error unbinding the connection");

                }

                mConnection = null;

            }

            mService = null;