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

am skip reason: Merged-In I37dc8d986ff4ae252a2b3f03f48e11a07429df8b with SHA-1 1056dff9 is already in history

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



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