Merge "Fix margins & padding to align long screenshot + markup" into sc-dev am: 33512be4 am: 2861d648 am: a4f0a63d

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

Change-Id: Ic981758571b8d319bd5e1c1cf0620c0cfd6e41f3