Merge "Make Markup fade in from screenshots" into sc-dev am: f34c9ede am: 2cbb36db am: 3e3ba4c1

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

Change-Id: If23e1e5efb492a16313c40d3826f2684559e8b7d