Merge "Add name to display device configuration." into udc-dev am: c7a54c4e

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



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