Merge "Fix issues with UserManager.DISALLOW_OUTGOING_CALL" into mnc-dev