Merge "PhoneAccounts include literal icon bitmap (4/4)" into lmp-mr1-dev