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

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

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