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: I518b21c7e66ef0cc154529b961296b0718289499