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

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



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