[automerger skipped] Merge "Telephony statsd atoms." am: b7254735 am:...

[automerger skipped] Merge "Telephony statsd atoms." am: b7254735 am: c4d0c943 -s ours am: 8d5940ea -s ours am: 58545d55 -s ours

am skip reason: Change-Id I124cf2da59ed4c5e92406081aac0df0f347ace74 with SHA-1 bb9ed921 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1326497

Change-Id: I12e270deca3a3fe33f308b8825a21287a55b3712