Merge "Instrument telephony-common when EMMA_INSTRUMENT_FRAMEWORK is true."...
Merge "Instrument telephony-common when EMMA_INSTRUMENT_FRAMEWORK is true." into nyc-mr1-dev am: 9dab89f2
am: 5557d734
Change-Id: I2eeeb565a6a8b93b4bf90b1535c39a33f2e1f991