[automerger skipped] Merge changes I4e976920,If2a1e621 am: 27e50206 am:...

[automerger skipped] Merge changes I4e976920,If2a1e621 am: 27e50206 am: d219abd9 -s ours am: ecec6861 -s ours

am skip reason: Merged-In I4e976920171de76025d1c9d2a8222b1c9f9dc8c1 with SHA-1 544ac9e8 is already in history

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

Change-Id: I1bd2b91b24bf91dde5c68a604b8fcecf4115c1ef