Merge "Give slightly more descriptive error messages when you can't find...

Merge "Give slightly more descriptive error messages when you can't find resource IDs" am: ae00bbfd am: be2d8803

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



Change-Id: I973128877a048f396fd85872b96a86c6ea9e6a2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>