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

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



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