[automerger skipped] Merge "Telephony plumbing for SIM call manager voice...

[automerger skipped] Merge "Telephony plumbing for SIM call manager voice status" am: f57a7aa6 -s ours am: c3a23f5b -s ours am: 47261a25 -s ours am: 52de576f -s ours am: a09ff529 -s ours

am skip reason: Merged-In Ie5967eb0dfb3e19cf60156740434e76c1794af4b with SHA-1 1486908c is already in history

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



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