Merge "Fix aggressive caching of RenderNode snapshot" into sc-v2-dev am: ddd6bac7c8 am: 501a46b056

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

Change-Id: Iced4bf7b7028fea8791477b95c6e504c36d00b03