Merge "Added data activity support" into tm-dev am: bff8c2328d am: 6b300f6fd8 am: bea6ea0865

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

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