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 am: c11e005d am: e3f01e7e

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

Change-Id: I0459a3d36c9b5fba94c5d5846fd36ff526139f70