Merge "Make Markup fade in from screenshots" into sc-dev am: f34c9ede am: 2ee9f11c am: f1c0a272

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

Change-Id: I3ce84b86a8f0fcd9b610dad73bdf9320f09848f5