[automerger skipped] Renamed name source to display name source am: 32982caa...

[automerger skipped] Renamed name source to display name source am: 32982caa am: 91f71e17 am: 6ab2ad2a -s ours am: 5c19b485 -s ours

am skip reason: Merged-In Icc370d5ad5c2a15fc4f4d7ad0c039a2421fb9bf5 with SHA-1 f38ad135 is already in history

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



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