[automerger skipped] Merge "Fix setAllowedCarrier" am: ed8cf648cd
am: 09c69d3301  -s ours

Change-Id: I385b32b82439fc828a003cdca21d7fc046dda7e0