[automerger skipped] Merge changes Idf14d782,If6bb738d am: ab6b67ea am:...

[automerger skipped] Merge changes Idf14d782,If6bb738d am: ab6b67ea am: 76104c6d am: 1298671d am: 1555b9a0 -s ours

am skip reason: Merged-In Idf14d782c5c679a34b6b3dbe86679084dc69e0d1 with SHA-1 061ecf8b is already in history

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

Change-Id: I8eea4bf30114bd95111becd5fb49064baf0c9fcf