Merge "Add vts test for setCarrierInfoForImsiEncryption" into oc-dr1-dev
am: e7acb1f8cf

Change-Id: I6ab82244f78f1b92938b8ab03eebfbd24514e6dd