[automerger skipped] Merge changes If05dd110,Iab541d69,I816a1b6e,I9bec0e35 am:...

[automerger skipped] Merge changes If05dd110,Iab541d69,I816a1b6e,I9bec0e35 am: bf1cdce9 am: 532a856c am: 077aa90b -s ours am: f6db23cc -s ours

am skip reason: Merged-In If05dd11051deea0a70a9aad129bcfa4ef487474a with SHA-1 f84f5895 is already in history

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



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