[automerger skipped] Merge "Cherry-pick problem. ag/13500949 lost one line...

[automerger skipped] Merge "Cherry-pick problem. ag/13500949 lost one line from ag/13517011" into sc-dev am: 1520d63a -s ours

am skip reason: skip tag Change-Id I45b12502d5d628cd94fe13351640d39b96a1c25f with SHA-1 55cfcae6 is already in history

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

Change-Id: Ib130185b68de60732f052d9fabb83752b9c6e83e