Merge "VTS: Fix IRadio.setAllowedCarriers and IRadio.nvResetConfig" into oc-dev am: eca8d114bf
am: 1a8f5c3595

Change-Id: Icb21f8f205b5d199c72741b209aac7b51eab32dd