[automerger skipped] Merge "Made some data components injectable" am:...

[automerger skipped] Merge "Made some data components injectable" am: 2db5c669 am: f18cb164 am: 6cdf0500 -s ours am: f4e701c9 -s ours

am skip reason: Merged-In I77241dc6dda3844ccb301bce0c843662a4d6d5eb with SHA-1 28abd305 is already in history

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



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