am 296a576d: am a54f8fd0: Merge "Improve setting of contact photos in InCallUI" into lmp-mr1-dev

* commit '296a576d818adb63b00cc179d6ad70a7f1d20e33':
  Improve setting of contact photos in InCallUI
tree: 6d2b1ac19ee128ca02a5898d285bcf132843d284
  1. InCallUI/