[automerger skipped] Merge "Update package of DataConnectionStats" am: 580dd34fa9 am: d009928e07 am: 987436928b -s ours

am skip reason: Change-Id I61c28599a03a66bf0d83d78076a0791ff63f48cc with SHA-1 1ad833e5fe is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I02ddc7e976f8f984ad7a7b8123548e4091fa2739