Merge "Made some data components injectable" into tm-dev am: cb948e37

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

Change-Id: I59c8fc3525639600f8c40c8b0486b768e2e2830a