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

Change-Id: Ia8870e6def6ff9805131660285b6833882407cf5