Merge "Increase the persistent storage size for SkSL Shaders" into sc-dev am: ad7fb842 am: c657d406

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

Change-Id: I5d2a0279e9feb312453200cf79bd8ae9827f2e71