am 09d22d71: Merge "PhoneAccounts include literal icon bitmap (4/4)" into lmp-mr1-dev automerge: 12ab630

* commit '09d22d712676818d8c51a5209e992aede69d226d':
  PhoneAccounts include literal icon bitmap (4/4)