Merge "Don't destroy ScreenshotActivity on size changes" into tm-qpr-dev am:...

Merge "Don't destroy ScreenshotActivity on size changes" into tm-qpr-dev am: 038359aa am: fd3769ca am: b76cc5a7 am: 8bc5a0ec

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



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