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: 8d74548c am: ff3686f0

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

Change-Id: I03f22b7afaa84f4ac82385837c43a03d7804dc29