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: 704e25ce

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

Change-Id: Ie747e94ad328126fa29fc18a127d32af7b900029