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

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



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