Merge "USB: Adjust exception message in dealing with permission check" into sc-qpr1-dev am: 9ca7052183

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

Change-Id: I978ebd538bf52d928e655cfb9c8f9f75c34e8eeb