[automerger skipped] Merge changes I32ad58bb,I18b28a3b,I5811c74f am:...

[automerger skipped] Merge changes I32ad58bb,I18b28a3b,I5811c74f am: 903b800d am: 090e14db -s ours am: 169e8b4e -s ours

am skip reason: Merged-In I32ad58bb01671cf4c19923cb3010cb5201c86d14 with SHA-1 71164c8d is already in history

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

Change-Id: Ifd36275c9e1736cbe93a5e23bdee7bf22ff96d43