Merge "Fix setCarrierInfoForImsiEncryption in VTS 1.6"