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

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



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