[automerger skipped] Merge changes Ie0385211,I251c678d am: 32b2f3b6 -s ours...

[automerger skipped] Merge changes Ie0385211,I251c678d am: 32b2f3b6 -s ours am: d26997bb -s ours am: b86240b3 -s ours

am skip reason: Merged-In Ie0385211ec3e8c209bf1fda8bb40a5bbd18b52df with SHA-1 6b7c4941 is already in history

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

Change-Id: If7527a47c455902c9a4f9a646c68922fbff92024