Merge "Add a generic error message for missing vendor error strings." into sc-dev am: 922fe0da am: dede5849

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

Change-Id: Id241e8a87d460a31a6dc1fe4fe3941140603b72b