[automerger skipped] Conditionally cache RenderEffect results am: 10f05d8f00 am: 9f989084fd -s ours am: d2d6705ab6 -s ours
am skip reason: Merged-In I3e478b11b66205d96e9499a362f7412a1d6e952d with SHA-1 4a6b60a5a8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15873776
Change-Id: I2ae924f8b33026653e6c7d1a45dd0687d8944339
This commit is contained in: