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 am: d5c741f8

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

Change-Id: Ia9e1cc5b6d34c29e5c5f33143b4b1c0e2e4780bf