[automerger skipped] Merge "USB: Adjust exception message in dealing with...

[automerger skipped] Merge "USB: Adjust exception message in dealing with permission check" into sc-qpr1-dev am: 9ca70521 am: f08ed825 am: d4127f67 -s ours

am skip reason: Merged-In Ic676b0d16e7d34b8ddf9dcb218eed0aa41e36cc7 with SHA-1 03042483 is already in history

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

Change-Id: I2c601373d1891517682483a646f3fe8583332869