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

[automerger skipped] Merge changes from topics "rename_display_name_source", "sdbm" am: 6e20c774 am: 9271d0b3 am: fdcd83a1 -s ours am: ac9accab -s ours am: 5f54cad8 -s ours

am skip reason: Merged-In I852e952a0ceeb4e16a1f63687935544a8d99e543 with SHA-1 c8b8a4e0 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2458533



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