[automerger skipped] Merge changes from topic "unused" am: 42a600e8 am:...

[automerger skipped] Merge changes from topic "unused" am: 42a600e8 am: b900f1c0 am: 77190faa -s ours am: 9ea5b105 -s ours

am skip reason: Merged-In I5b1d5e1a706227bd9e2a7935d0a313b5f0273723 with SHA-1 f14b9c6f is already in history

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



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