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: Ie976e48659753a17a7d48518f3bd71082d609d9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>