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: I6df8fcbd8d4f1e8ae3d6180039f4e0f25a0b81ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>