Merge "Animate screenshot dismiss button appearance" into rvc-dev am: 0d3440f4 am: d9fffd42

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

Change-Id: I3f8e108cd551c902449f50864e1f335b1d901c80