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

Change-Id: I0957db378cd4a4b775ef2016023e3edb9cc62b61