[automerger skipped] Merge "Improve performance of generations in the resource...

[automerger skipped] Merge "Improve performance of generations in the resource cache" into udc-qpr-dev am: cfb10296 -s ours am: 7cd1b5c8 -s ours

am skip reason: Merged-In I5144f08bb38d0e600b7f556df834292e50afb91c with SHA-1 a9ef8767 is already in history

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



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