Merge "Added data activity support" into tm-dev am: bff8c2328d am: 465bf3f8cf

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

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