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 am: ba43569c

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



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