[automerger skipped] Merge "Added data activity support" am: a003ac0136 am: 24faaa233e -s ours

am skip reason: Merged-In I6098c493e104ba3906db0c96d1106a01d1605d25 with SHA-1 0eda684dfb is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2092743

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