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