Merge "Prevent Caching the Invalid Resource" am: a997cf4420

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

Change-Id: I50f07eef2baf91b2f6787c7052217459d5be35dc