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

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

Change-Id: I92d3af8011caa4c91a32046f0c0ae22601eda3a8