Merge "Fix setCarrierInfoForImsiEncryption in VTS 1.6" am: 4c912d9042

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1646852

Change-Id: I6acba27ce599f08525b1d083443694016f79dd80