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

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



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