[automerger skipped] Merge "Fix setAllowedCarrier" into pie-vts-dev
am: 052f207b42  -s ours

Change-Id: Ic6f3763761f13361d21d14594042011e797099f1