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

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

Change-Id: Ib07558ce68c2342bab9d4a3422de5097e234bb2b