[automerger skipped] Merge changes I67936863,I3b417ee5,Ib3469de3 am:...

[automerger skipped] Merge changes I67936863,I3b417ee5,Ib3469de3 am: b8e2f149 am: c0e26139 am: 793a97e6 -s ours am: fb7563eb -s ours

am skip reason: Merged-In I679368636b97a49814bbfec362c06b419a27af37 with SHA-1 890f54ae is already in history

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

Change-Id: I5c5ef1ee1e4aa8e82c3b24c29693b8ae47f4dcde