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 am: 46430582

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



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