Merge changes from topic "usb-dp-dumpsys" into udc-qpr-dev am: 25bd066f am: b8b2ad02

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



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