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

* commit 'a54f8fd0d0349d94a2ab93915cfff9178c8e5c25':
  Improve setting of contact photos in InCallUI
tree: 428f230e640260b8778f5a66fde472fc187f710f
  1. InCallUI/