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

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

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



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