[automerger skipped] Merge "Log telephony atoms to statsd." am: 1cb6a4f3 am:...

[automerger skipped] Merge "Log telephony atoms to statsd." am: 1cb6a4f3 am: 81ecc696 -s ours am: 46c2b138 -s ours am: a96c7a4a -s ours am: 9d446ccc -s ours

am skip reason: Change-Id I399a76bb0b1a5da53488f3ed05108d4eb7c8839a with SHA-1 4761fd62 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1326694

Change-Id: Ied6ef7e20c9ff81a4d10576fa727c9f868b1b494