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

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

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