Merge "Telephony statsd atoms." am: b7254735e2

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

Change-Id: Ia5b3be0ea32c7e7de943e250ebb7ae8a3caa184e