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