Merge "Improve performance of generations in the resource cache" into udc-dev am: a0bbc289

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



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