Merge "Fix setAllowedCarrier" into pi-dev
am: 503fed748d

Change-Id: I6aaeac46b1ca585d138eb62257f567f6f085f70a