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

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



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