Merge "Improve performance of generations in the resource cache" into udc-dev...

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

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



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