Merge "Rename paraneter device_name to device_type in single device dialog"...

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

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



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