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

Change-Id: Ie7ec0a819c00c0c869d0ad8e8b8427ab47f77457