Merge "Fix aggressive caching of RenderNode snapshot" into sc-qpr1-dev am: baa35d0ab9 am: 5007cbe22a am: 4d95733733

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

Change-Id: Ia75ee35756808e9703f22bac374fa1dda7cbbabe