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

[automerger skipped] Merge "Improve performance of generations in the resource cache" into udc-dev am: a0bbc289 am: 3fc9a70e am: 46430582 am: d90f3555 -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/+/23644746



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