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: I7396577660b1b6f1d3e0f3817b8ecf001b25c348