Merge "Merge "Hide contaminant dialog "Enable USB" button if not supported"...

Merge "Merge "Hide contaminant dialog "Enable USB" button if not supported" am: f0937e77 am: e2be488e am: 87ecd2ec am: d6f466e3" into udc-d1-dev-plus-aosp am: c46a0472

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



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