Merge "Add device type at the end of summary for single device" into udc-dev am: 43957576

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



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