[automerger skipped] Merge changes I7b0f20bb,I6fcf1895 am: e31de851 am:...

[automerger skipped] Merge changes I7b0f20bb,I6fcf1895 am: e31de851 am: b5ff3536 am: 7861e06e am: fda9440b -s ours am: 9ca5ce11 -s ours

am skip reason: Change-Id I7b0f20bb499cd50978206265707a806521f08437 with SHA-1 c327587d is in history

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

Change-Id: Id0f336d380d5f9ae37d7cb462709833da3686119