[automerger skipped] Merge "Improve performance of generations in the resource cache" into udc-dev am: a0bbc289 am: 3fc9a70e -s ours

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

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



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