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

Change-Id: I3a45af847f8453f362e18c3a42aec6aa77313e0b