[automerger skipped] Add support for Data calls metrics am: 3bb1c983 am: eb678fad am: 1899ece2 -s ours

am skip reason: Change-Id I84606557a00091b7a2f44f6a03df2e316a7b46dd with SHA-1 b3440563 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I664d388200b46ef0d1f3fbb1715e965a5f122db6