Merge "USB: Adjust exception message in dealing with permission check #2" into sc-qpr1-dev am: 8173263d am: 0bce8531

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

Change-Id: I078df8769c0ffd8f2113cf07f717cac17bfc9fc8