[automerger skipped] Merge "DPM API to enable or disable USB data signaling"...

[automerger skipped] Merge "DPM API to enable or disable USB data signaling" into sc-dev am: 3720fa62 am: 7f04f533 -s ours

am skip reason: Merged-In I1d2d71ec05a1565f58ffd691a66c68171a4f9b00 with SHA-1 51f1c853 is already in history

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

Change-Id: I70ff15d5893bc8f91a95f271ee954852bbed9a03