Merge "Synchronize increment of resource cache generations" into udc-dev am:...

Merge "Synchronize increment of resource cache generations" into udc-dev am: dd337315 am: 0bdacdfc am: f49451bb

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



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