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

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



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