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: 4f9d864e am: 88fb906c

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

Change-Id: Ib47573e8f7317f084a3568e5733d5969b4daf78f