Merge "Add vts test for setCarrierInfoForImsiEncryption" am: afcdb1effb am: d4c6c7b703 am: b08d3972fa  -s ours
am: 6d188affde  -s ours

Change-Id: I5de574484b633ebbb53011ed38d9c742353ddc40