Merge "Added Locking for MmTelFeature"

        @Override

        public int queryCapabilityStatus() throws RemoteException {

            synchronized (mLock) {

                return MmTelFeature.this.queryCapabilityStatus().mCapabilities;

            }

        }

        @Override

        public void addCapabilityCallback(IImsCapabilityCallback c) {

            // no need to lock, structure already handles multithreading.

            MmTelFeature.this.addCapabilityCallback(c);

        }

        @Override

        public void removeCapabilityCallback(IImsCapabilityCallback c) {

            // no need to lock, structure already handles multithreading.

            MmTelFeature.this.removeCapabilityCallback(c);

        }

        @Override

        public void changeCapabilitiesConfiguration(CapabilityChangeRequest request,

                IImsCapabilityCallback c) throws RemoteException {

            synchronized (mLock) {

                MmTelFeature.this.requestChangeEnabledCapabilities(request, c);

            }

        }

        @Override

        public void queryCapabilityConfiguration(int capability, int radioTech,

                IImsCapabilityCallback c) {

            synchronized (mLock) {

                queryCapabilityConfigurationInternal(capability, radioTech, c);

            }

        }

        @Override

        public void setSmsListener(IImsSmsListener l) throws RemoteException {

            synchronized (mLock) {

                MmTelFeature.this.setSmsListener(l);

            }

        }

        @Override

        public void sendSms(int token, int messageRef, String format, String smsc, boolean retry,