Merge "Add a generic error message for missing vendor error strings." into...

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

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

Change-Id: I2ba217fc3796f6117571867cc0c3b39dd74d4fb4