Merge "Make screenshot dismiss to the side on timeout" into sc-qpr1-dev am:...

Merge "Make screenshot dismiss to the side on timeout" into sc-qpr1-dev am: df2554e6 am: 1a1bfe14

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

Change-Id: I0a9cd231ad15897cbebbf62732b551dea7c026d6