[automerger skipped] Merge "Track generations in resource caches" into udc-dev...

[automerger skipped] Merge "Track generations in resource caches" into udc-dev am: a2f3279d am: 47289587 -s ours

am skip reason: Merged-In I37dc8d986ff4ae252a2b3f03f48e11a07429df8b with SHA-1 599a7f22 is already in history

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



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