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

Change-Id: I7854d76e479809882cde2b1b57e87cacf075cb84