Merge "Rename paraneter device_name to device_type in single device dialog" into udc-dev am: 92393d67 am: d486ebb9

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



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