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 am: 64bc5716

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



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