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

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

Change-Id: I0b366685c74f53f0a93f3790646b6a038a28f38e