[automerger skipped] Merge changes I927cc046,I29c50c3b am: 837f0ebd am:...

[automerger skipped] Merge changes I927cc046,I29c50c3b am: 837f0ebd am: 8ea033a4 am: 4bc2c217 -s ours

am skip reason: Merged-In I927cc0468e87c18a7682b9b0a8aa48d2e244be02 with SHA-1 950281a6 is already in history

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

Change-Id: I5f5201835f8ac72c3bcae1f7c8c1f92d4d619aa8