Merge "Fix setCarrierInfoForImsiEncryption in VTS 1.6" am: 4c912d9042 am: 2d962bae92 am: 6932319f1f am: 29090fb9bc

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

Change-Id: If5f36a0bb352a35a2ad98d8859ef50e2e5521d37