Merge "Rename paraneter device_name to device_type in single device dialog" into udc-dev am: 92393d677c am: 9ff527c5ac

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

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