[automerger skipped] Merge changes from topics "rename_display_name_source",...

[automerger skipped] Merge changes from topics "rename_display_name_source", "sdbm" am: c787c82a am: 82ee9f75 am: cd7f226a -s ours am: f208656f -s ours am: bd18bfcd -s ours

am skip reason: Merged-In I88c9b07a3e1085109a8612cd7d3e80d1e7965dfd with SHA-1 7d4dd3c2 is already in history

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



Change-Id: Ic7053518d9c21e8d4f4d109a0d1f3e2d248e4196
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>