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

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

Change-Id: I5796974954fd2ed5f2dd175feaf1b427f20ffd45