Merge "Fix storing VkPipelineCache in HWUI's shader cache breaking...

Merge "Fix storing VkPipelineCache in HWUI's shader cache breaking persistence" into tm-qpr-dev am: cae3b6f7

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



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