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

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



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