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

Change-Id: Ifa3022ee1cb1e03c75c67856d30904c4b3ce83db