Merge "[3/4] Use new Icon class in PhoneAccount." into mnc-dev