[automerger skipped] Merge changes I3e532322,I7eaf15ae am: fc5f0fbb -s ours...

[automerger skipped] Merge changes I3e532322,I7eaf15ae am: fc5f0fbb -s ours am: 14db6524 -s ours am: 5a2af4c3 -s ours am: 97f4a82c -s ours am: 08fba61e -s ours

am skip reason: Merged-In I3e532322ce2c875bcadade608eeffe7fcb0201b8 with SHA-1 2faa1ebc is already in history

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

Change-Id: I6c648f5938aa4929e35af74d4c5263f183283fac