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

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



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