[automerger skipped] Merge "Fixed dangling DC controller" into rvc-qpr-dev am:...

[automerger skipped] Merge "Fixed dangling DC controller" into rvc-qpr-dev am: e3dc5c48 -s ours am: 68437886 -s ours

am skip reason: Change-Id I6a74fcaf60f66e49a389ae9840a925dc789940f1 with SHA-1 b2a68cca is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1eda295c98ded8b913d4ce7d1ff9f556b50d4140