[automerger skipped] Merge "Add call quality metrics to telephony.proto" am:...
[automerger skipped] Merge "Add call quality metrics to telephony.proto" am: 6ab9b4a7 am: 22541ff1
am: f7d69f79 -s ours
am skip reason: change_id Id1b79b88b53353e9a1d7bb2c7561c824205be45e with SHA1 67f3152f is in history
Change-Id: I2637f321ccb1a83818bc8084fe5990a92fda3c0c