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

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

Change-Id: I41fd49fcf921201efc588edb435f46fbc28b52ad