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

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



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