[automerger skipped] Merge changes I02995faf,If51829ab,I6cb09aa0 am:...

[automerger skipped] Merge changes I02995faf,If51829ab,I6cb09aa0 am: 43835f40 am: b112a246 am: 44492260 -s ours am: cbed9ca0 -s ours

am skip reason: Merged-In I02995faf544da31da25a25336a0923d839230663 with SHA-1 797df63f is already in history

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

Change-Id: I119de7a3ec21f4b37ef06124205cd3db8b383862