[automerger skipped] Merge changes from topic "data_issues" am: b1b9f3b7 am:...

[automerger skipped] Merge changes from topic "data_issues" am: b1b9f3b7 am: cab27103 am: 20b6383f -s ours am: 61891ca4 -s ours

am skip reason: Merged-In I895cd1039f9237ae6b8f9b6cb7f45eab70280db6 with SHA-1 1e55b3b7 is already in history

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

Change-Id: I84e45d3aef9766d1dba68befb9468ef834264304