Merge "Fix screnshot null during rotation" into tm-qpr-dev am: 4055b792 am:...

Merge "Fix screnshot null during rotation" into tm-qpr-dev am: 4055b792 am: b71453f4 am: c86069f7

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



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