Merge "Fix drawable-state cache expired issue" into main am: 3ba29fc4 am:...

Merge "Fix drawable-state cache expired issue" into main am: 3ba29fc4 am: 4c7d041b am: a01000b4 am: 988bb1d2

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



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