Merge "Made some data components injectable" am: 2db5c669

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



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