Merge "Fix screenshot surface null during animation" into tm-qpr-dev am: 00d5f828

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



Change-Id: I55d0744603803bbccc20614badd23880a2b4c094
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>