Merge "Include skipContentDraw flag to cache blur and shadow shaders" into sc-dev am: 504a4d8f am: 43a96770

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

Change-Id: I094af8a8d95377ade3d229e7c9f5dbc793477b31