Merge "Do not cache the resource if the active sub info is null" into tm-dev...

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

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



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