[automerger skipped] Merge changes I53c01060,Iff8c36f5 am: 53811b99 am:...

[automerger skipped] Merge changes I53c01060,Iff8c36f5 am: 53811b99 am: 2d74d181 -s ours am: 73101613 -s ours

am skip reason: Change-Id I53c010608dd8796003b33f8ba0f4249108aecee2 with SHA-1 1559a6e2 is in history

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

Change-Id: I628f6cc457ee66492bf7f1aaf4c05713d466fcdb