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

Change-Id: Ic5698c43f889e12464ae9bd541cb40d3f52ec22f