Merge "Dismiss screenshot UI on back gesture/button." into rvc-dev am: 50886ed9a2

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

Change-Id: I1c3b90fd698b5758579abe34e5b265983e2bfe1d