Merge "Add vts test for setCarrierInfoForImsiEncryption" am: afcdb1effb
am: d4c6c7b703

Change-Id: I83091fa9a0374478a6a0c69a3787cb061967f257