[automerger skipped] Merge "Synchronize increment of resource cache...

[automerger skipped] Merge "Synchronize increment of resource cache generations" into udc-dev am: dd337315 am: 0bdacdfc am: bc1efaf0 -s ours

am skip reason: Merged-In I6189813291d3581fc401fd29801ae46c6eeab58c with SHA-1 d58dcf55 is already in history

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



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