Merge "Merge "Cache call type icons" into nyc-dev am: e5634164a0 am: 9bb027e7dc" into nyc-mr1-dev-plus-aosp
am: 71cd4c6474

* commit '71cd4c6474a3d0de76bb6699bc5082b034fc83dd':

Change-Id: I3bd26d0df670f016bb34551a60a0feb0330e35c7