Merge "Fix setAllowedCarrier"
am: ed8cf648cd

Change-Id: Ic7bb4641c73f7a1cec98d63200ff0796c6cdac9f