Merge "Update PhoneAccount icon API (5/6)" into lmp-mr1-dev