Merge "Prevent Caching the Invalid Resource" am: a997cf4420 am: 00330273ed

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

Change-Id: I62b026efe21adfceb24235da89f7bca8385ed22e