Merge "Track generations in resource caches" into udc-dev am: a2f3279d

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



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