Merge "Reset data activity after traffic status poll stops" am: 7a24d893 am:...

Merge "Reset data activity after traffic status poll stops" am: 7a24d893 am: 3a9da07e am: adc124a4

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



Change-Id: I27629f8d980f817f258a4c0fe4f7f0be9de1db9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>