Merge "Add vts test for setCarrierInfoForImsiEncryption"
am: afcdb1effb

Change-Id: I08ab4ff325457ee5242060a5b40e56ce0c227ad4