Merge "Do not cache the resource if the active sub info is null" into tm-dev am: 3fda2bf2

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



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