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: 24cf2b25

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



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