Merge changes from topics "rename_display_name_source", "sdbm" am: c787c82a am: 82ee9f75

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



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