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

Change-Id: I768f9aafa5a1a4618bb91fffdcab1f587919372d