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

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



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