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

Change-Id: I77c5aecd2e2512bfd54eb43347e7ad303bf4340d