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

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

Change-Id: I92bd974cdaee83810928d1e5bea0c36ed1c13b4a