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

Change-Id: I314af896791d66040133bfc76974dd0a75b838f1